*: Pass the master, worker and bootstrap ignition content to the terraform. #301
Conversation
openshift-ci-robot
added
size/M
yifan-gu
force-pushed
the
ignition_by_value
branch
from
0e274c0
to
0e1b294
Compare
openshift-ci-robot
added
size/L
| @@ -68,12 +71,14 @@ func (c *ConfigGenerator) GenerateIgnConfig(clusterDir string) error { | |||
| c.appendCertificateAuthority(&ignCfg, ca) | |||
| c.embedAppendBlock(&ignCfg, "master", fmt.Sprintf("etcd_index=%d", i)) | |||
|
|
|||
| if err = ignCfgToFile(ignCfg, filepath.Join(clusterDir, fmt.Sprintf(config.IgnitionPathMaster, i))); err != nil { | |||
| return err | |||
| masterIgn, err := json.MarshalIndent(&ignCfg, "", " ") | |||
There was a problem hiding this comment.
we shouldn't be indenting as it will be part of the terraform.tfvars
pkg/types/config/cluster.go
Outdated
| IgnitionBootstrap string `json:"openshift_ignition_bootstrap,omitempty" yaml:"-"` | ||
| IgnitionMasters []string `json:"openshift_ignition_master,omitempty" yaml:"-"` | ||
| IgnitionWorker string `json:"openshift_ignition_worker,omitempty" yaml:"-"` | ||
| IgnitionBootstrap string `json:"ignition_bootstrap,omitempty" yaml:"ignitionBootstrap"` |
There was a problem hiding this comment.
changed yaml:"-" to yaml:"<something>"; We might wanna keep it ignored.
yifan-gu
force-pushed
the
ignition_by_value
branch
7 times, most recently
from
d499821
to
f759287
Compare
|
Can you fix up the commit message on the one? |
yifan-gu
force-pushed
the
ignition_by_value
branch
2 times, most recently
from
d9c525d
to
adb9063
Compare
yifan-gu
changed the title
yifan-gu
force-pushed
the
ignition_by_value
branch
from
adb9063
to
f52ea3e
Compare
Previously, the installer binary generates the ignitions for master and worker nodes, and pass the filename to the terraform. However, in the new installer binary, we will instead pass the content of the ignition files to terraform.
yifan-gu
force-pushed
the
ignition_by_value
branch
from
f52ea3e
to
9b21941
Compare
|
This requires openshift/release#1630. |
If the "ignition_bootstrap" is non-empty in the terraform.tfvars, then use it as the content for the bootstrap ignition. This will enable the new installer binary to launch a cluster.
yifan-gu
force-pushed
the
ignition_by_value
branch
from
9b21941
to
2e340f1
Compare
|
/retest |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: crawford, yifan-gu The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
@yifan-gu: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
wking
added
the
needs-rebase
|
(Accidentally) superseded by #289. /close |
|
@crawford: Closing this PR. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Previously, the installer binary generates the ignitions for master
and worker nodes, and pass the filename to the terraform.
However, in the new installer binary, we will instead pass the content
of the ignition files to terraform.
Also adds an option to use the bootstrap ignition from the tfvars file directly.